Move the string pools down into the units. No functional change.