Extend replacement notation to support all of Type