Bug 857254 - use CGIfWrapper more consistently; r=bz
Bug 857254 - add CGTemplatedType and use it everywhere; r=bz