various cleanups suggested by Duncan