Rework some more, based on feedback from jmmv@.