Finished CLI cleanup. Back on Mono about to go PInvoke.