Revert "Separated variables version"

This reverts commit 840977e5dbad91c65df6317ff10cb03c1ea11532.
AAMAS experimental tweaks

Includes tweaks made prior to the AAMAS deadline.