Models should always include their parent classes to be safe. Bake should reflect the best practice. Refs #1971