[#866923] Review fixes from jbuck.