Fix grammar rules in Types.
Put handler projection rules in form that I originally wanted.