@emersion It's a bit macro heavy and the setjump at the beginning is disturbing. It's definitely not decomposed in an object oriented way but it doesn't seem too bad to me so far.