Small code cleanups to pwiz