Knock-refactoring from last BMM lib refactoring.