Simplify call selector.
Mid refactor of state.