Miscellaneous tweaks

(Sorry for the composite pull request, but I think the tweaks are too trivial to generate any discussion.)