Externalize strings + cleanup in PrimitivePropertyBuilders.