Be more flexible about parsing parameters