OK, so I never figured out what was going wrong here, but abandoning the git patch I was working on and starting a new one from scratch got it to work.
Just some random glitch, I guess.