If blocks with 'return' shouldn't have else blocks
Move extension MULTICHAR_CONSTANT_L declarations closer to switch