Haha.  We were missing the forest for the trees.  That gravity term isn't even needed.  It was just there historically because it _used_ to carry the negative sign before gravity was moved into physical constants and reversed.

What atan needs fixing?