Clean up 'when/of/otherwise' code constructs
Merge branch 'master' of https://github.com/dschmenk/PLASMA