Added a few scalabits for pattern matching and options.