Address bmalloc comments. Tune.