HRM: Don't use a context by default (we copy location_id onaccept to avoid
joins)
A little more optimisation/cleanup