Various source cleanups