[PATCH][XSM][FLASK] Argument handling bugs in XSM:FLASK