Revamping stuff in order to make life easier on XBuild.