mbtool: More OCD