Some more small changes for bug #8362.