Remove more admits, add more work-arounds