ocs2007: DRY removal of status tokens