Remove uses of else in match.

Also, a few micellaneous fixes for the prototype trace browser