Some refactoring related to the previous commit (--titrate_only option).