Tweak to tweak (thanks to kxs).
Added tweak suggested by Konrad.
Update to Johan's latest semantics + script file version.