Clean up interpolation a bit.