Consolidate bulletin types to only one type. Fixes #167