Could be merged, with the change noted by @corny, I think.