Fix uniform initialization "narrowing" problems, #PF somewhere. Will
have to debug later.