Overhaul the symbol system again