Various misc hackery which didn't seem to have made it through since the
last commit.