Fix two more scripts

There a cheat in untypedSafetyScript for a case where I haven't made the
definition yet