Fix a LOT of edict false positives.  Also fix whitespace.