Some private functions escaped my wrath in commit a277b409. Thanks to: Emilio Pozuelo Monfort on #clutter