Fix #105 - Unify expand and expand_add
A single function to represent the use of some resource by an action. Fixes #105 (closed)
May impact concurrency checks. maxmin_bench test has totally changed, cannot verify output. No impact on other tests though.