Rewrote SPSR handling

Commit needs review still. Watch for regression.