Merge pull request #372 from glynnc/master

More Bitmap-related clean-up