Refs #4338: address remarks from the PR