jdonaldson clean up conditional logic a bit, add handling for interfaces

Latest commit efd5e2d

Mar 5, 2014