HOPKINS: Refactor CHARGE_OBSTACLE