Context issues and 5.X

Fixed them, except don't use audience selection. That still needs to be done.

See http://drupal.org/node/121822 for that fix and more.

Not compatible with the 4.7 context patch.