Proj mixin cleanup based on denis' PR

I rebased on master.

A careful review would be appreciated.