first good non-complex pass at complex annotations