core: further logical changes for abort.