More avoiding use of static vars

See parent for reasons