Added pattern for type extensions.  Fixed to not print extra spaces after identifiers.