Fix user argument handling.