Fix nits noted by landry@