Re-enabling and cleaning up bloom a bit.