Add a hook to simplify driver metadata.  Fix a few object dispatch mistakes.