Minor code conventions - refs BT#8232