Rewrite Nasal wiper code, minor tweaks to master.nas