Cleanup per notes.

Some small changes to per notes from @mpdehann.