More simplifications user the assumption of an always implicit
optional user, plus whitespace fixes.