Cleanups suggested by Greg Clayton.