Several minor consistency improvements.