More general code cleanup; next up: real symbol handling