Updated everything to work with 1.7.2.  Code cleanups still pending.