Ok, I will put the comments back in for now so that we're aware of places that might need some more test coverage with journaling.