Further cleanups to my previous patches to make code consistent.