Argh, stray code got into previous commits