Re-ordered and clarified TODO

darcs-hash:20090105105047-58103-a9003ccd245444998a38c37a1462bd3c2ac5f932