Testing the EXT_no_config_context series revealed that a bunch more things were broken than I expected. While I work my way through that, here's one trivial cleanup and a couple of pretty obvious bugfixes. - ajax