Miscellaneous cleanups & simplifications