Cleanup, more type ops moved to lower case.