Tidy up passing of variables into FME