Small clean up changes. Published as v 1.19.