Minor tweaks to font-locking and file formatting.