CE-1162 Minor code review tweaks