I would make sure @cvan takes a look at this because of #1194.