A few more cleanups: