CLI tweaks and cleanups.