fix WITHOUT_GUI; minor clean-up Reported by: pav,gerald [1] PR: 159917 Approved by: Rob Farmer (maintainer)