Rest of the 'More' stuff will need changing as similar.
NB: This commit will cause breakages if used with 1.2, I'm not sure how to code around this.
Hmm, looks like I should have asked to merge into 1.3 branch or master, which still doesn't contain these changes as far as I can see, but I checked and modded the 1.2 branch rather than the 1.3. Ho hum, that's me being silly with git. Will fix later.