Small improvements to previous changes.