Added missing expansion calls to symbol categorization