Get rid of top level re-assignment