Miscellaneous bitmap refactoring.
4 files changed