Scope base classes and arg defaults properly