... and some left-over comments. The workaround code is actually more readable than the previous version, so it may as well stay. Fixes #109