Remove a bit of indirection and saved state.