- More work on default-case (issue #282)