Other changes to make bmp085-specific filtering and file-naming work.