Fixes for code formatting support

This commit _will not be kept_ – if it is found necessary, it will be
squashed into the previous one, otherwise it will be discarded. Do not
base any commits on this commit. You have been warned.