OK. I didn't actually change anything there - I just deleted an obsolete else-clause. However, I'll try to clean up a bit there once the build failure is resolved.