Fix some issues regarding arbitrary variable mapping

2012-02-07, laurent