enclosure: Shrink things a bit (WIP)