style guide updates based on feedback in bug 863160