Cleaned up feature dumping a bit.