Refactored existing code to use the context specific type system.