Tweak 838fcce a bit to be more adaptable to change. Issue bryanhirsch/Drupal4OK#132