Just some more minor cleanups that have accumulated as I have worked on speeding up dfa creation and reducing it memory foot print. Hopefully the next set of patches will have some big wins in them.