Added special case of 'type' keyword

- I'd like to do this for "generic" type declarations but I'm sure it
  doesn't work everywhere