House-keeping

Some very small minor clean-up.

Not sure why the branch merge was needed.