Made a number of structural changes to the include patterns and extern template declarations related to joint-spaces and limits.