Minor code cleanup in Typing and removed debugging output