xl: more command-line parsing (to squash)

Signed-off-by: David Scott <dave.scott@citrix.com>