Looks like both those patches are useful. I like lowlight's a lot because it makes the WPS files much clearer and gives a more concise syntax, which isn't exactly the case with kahuna_999's patch. But I think the added flexibility it brings would be welcome too, so basically I'm in favour of committing both patches