A few small changes to (somewhat) better support GF4.  Mostly it's about allowing a bit more flexibility via configuration.