Refactor Bippo-specific stuff. Refs #14.