Cleanup of how roll/change works (less reliance on null state)