Simplify action resolver to make it easier to override