Fix for #1913 - Do not merge yet

Just a test for #1913

We have a few solutions here:

1. Reverting to 2.3 arguments order (breaking 2.4 compat) *and* change root_level to `Argument`
2. Just change `root_level` to `Argument`
3. Use an integer value insted of `None`