Add more/better clean targets
Closing in on actual failing cases
All JSON tests pass
AFAICT no reason not to subclass dict