Changes to OSI report

As a first step towards patching up the OSI report in line with @jwyg's comments, here are a bunch of small fixes. All changes are merely stylistic rather that substantial.

With @lucychambers's permission, I may move on to trying to implement the bigger changes next.