Cleanups -- I did a full bootstrap of the compiler, still works like a charm :)