As part of my ongoing fight for 'z' instead of 's', should we take this opportunity to convert this set of files from "analyser" to "analyzer"?  Maybe as a separate merge before this one.