Merged mod_cxx refactor branch.