Improved handling of type specifiers.