Fixed issues pointed out in SaltarelleCompiler/#118