Wrapping more of interpolation.h