Support query names starting with an uppercase
Use the correct guards for nullability checks
Add some whitespace around annotations