Fix some more regressions from r46845 reported by Brad Jorsch on the mediawiki-api...