Simplify release_roles DSL logic

The specs pass but the intention is now clearer.