Agreed; doing so would also bring this closer in line with the implementations mentioned in the description above that I've emulated here.