Refactoring based on bcdoc changes.