Cleanup based on suggestions by jmmv@.