Change in option parsing

This change is necessary in order to work around
the introduction of a method called "options" in
scala's commit f3731f9ace5d3d5e213ea786fe0027ea66c5358b.

Please note that, due to further changes in 2.11.0-M6,
the 'expected_output' content will need to be updated;
the tests are currently failing on M6+, since some of the
output is now slightly different.