Fix for online generator

This prepares for fixing expansions options used in the online generator not being cleaned (mainly: lowercased) properly by separating option parsing from option cleaning.