A-mods need to be tested more. ...and this is what happens when you forget to stash changes before a merge. Lesson learned.