v22: more: updates to style-guide