Improved support for off-specular scattering.

Improve ripple models.