Slight tweaks to inheritance.