lib/util: Simplify bitmap.c a bit