Tiny nit: Can we put this in a block?