more cleanups moving towards self-compilation