dnn-3461 Resolve Extension Conflicts (minor code refactoring)