Oren-Nayar fixes and cleanups