Fixing up formating of code around calls to driver() where we are having errors.
Fixing up formating of code around calls to driver() where we are having errors.

hickerson/bbn,hickerson/bbn,hickerson/bbn,hickerson/bbn