[OTLayout] Clean up closure() a bit
3 files changed