Updates to reflect clarity from GH-210.