Refine Typeof and replace the Typeable calls.