Do we need to retain this comment? (note that I've not read further down the code yet).