Fixup with Ian's comments.