Mostly syntactic cleanups...