Some codechanges and -cleanups.