Incremental changes for #328.  Resolution still in progress.  Fewer false positives are present however with these changes and recent updates to Grizzly.