Teach factor to accept whitespace separated arguments (reported by Robert Thompson).

(The diff looks bigger than it is because of reindenting.)