See amendments in aab185a... I think we're almost there now!