Removed already-addressed fixme, and updated formatting of a few lines
that were triggering Harbormaster.