minor beautifications

corresponds to Perforce change 6075.