Well, that last commit was rather half-baked. How embarrassing. It should actually work now.