minor further refactoring of marmot2-maps
minor further refactoring of marmot2-maps

rrnewton/WaveScript,rrnewton/WaveScript,rrnewton/WaveScript,rrnewton/WaveScript,rrnewton/WaveScript,rrnewton/WaveScript,rrnewton/WaveScript