Refactoring work for TypeHelpers.
Added TODOs from review. Also simple fixes where possible.