R1:3b8ff34f9b8c

Fix some minor Celerity / ShapedRequest bugs:
- Force celerity to do disk reads in dev.
- Clean up some ShapedRequest clownery.