Simplify some aborts