Fixing annotation so it works for real now this time. (I think this is actually the worst code I've ever written, in 20 years.)