Simplify setting map object states

Don't bother checking for recursion.