entry_endpoints: remove helpers -- just do the work in the same function