Cleaned up macro definitions; added macro SORT_TOKENS()