This patch, a follow-up for 588628de, removes duplicate types like T and PointerT in favor of reference and pointer, respectively.