MNT: Additional refactoring to fix my refuctoring. Mostly these are minor changes to __init__ methods to ensure reasonable default behaviors