Changes following feedback from Michael Kraxner and Markus Plangg.