Minor changes per Jeff's request on PR for 1.8.4