Better annotation checking (Cheddy)