Address more comments from jdm.