Commit initial portion of EditPage refactoring.