[PATCH] Cleanup 2nd argument set parsing/setting