mesa WIP: minor change and cleanup, non-driver part seems OK