Sort out "BasicPrimitives" section