Fix inconsistencies between change Ie7e7d592 and I8a937b57.