Addressing review comments from jmclaus.