Minor progress on Bijection<> code