Refactoring recent changes from Content.Node fork into public fork, and unifying codebase again.