Change set/unset to build/revert and improve output