Choose between Typeable and Typeable1
Fix some lint