Minor tweaks from review of subclass must implement rule