Followup r82727, improve comments, cast return value to bool