Address review feedback from the previous commit. (cherry picked from commit 712d39a624)
712d39a624
Type.interfaceTypeOfArchetype