More consts.
Comments to };
Clean that up so that I don't leak, even in odd cases.
Numerous new warnings and fixes on mac.