For #256 remove commented out code(!).
For #256 ACF compatibility
For #256 add missing assignments to initial variables.

Surprised this ever worked - possibly order-dependent since tests don't use VAR?