Tweak the way that annotation targets get serialized. Additional cleanup