Extended work on `Style adjustments #68`