Makes sense now with the restricted ``except`` statement :) I'll let @lamblin do the merge though, since I didn't review it all.