Adding inherits keyword, tidying type declarations
Adding prime to the list of keyword characters