Clean up Typeable; derive more Generic