[XS] Change in onomondo-eim[master]: rest_handler, cosmetic: clean up order of variable assignments