#25 - Reorganize Expression categories.