I just figured out why this code is giving me so much trouble. It's not in git yet. Put it in VCS, and you get much less lip.