There's also a small fix that @dbaker suggested once upon a time, but I forgot to send it out previously.