Finalizing support for keyword type checking