Cleaned up several of the domain include directives to be more robust.