Simplify (and almost fix) Ultima rules