Simplify Instance.save control flow (and lint some stuff)