Modernize bmp-impl