Format and performance improvements.
Re-order things to make format slightly more linear.  Also performance
improvements as a result of only invoking system_profiler once for each
DataType instead of repeatedly.