Addressing (part of) the commit review concerns.