Slight comment and naming tweaks.