fix interpolation for model methods

sorry, was have some fun times with git at this time of night ;)

here's just the interpolation fixes. you'll want to pull the test fix PR in first to make sure all the tests work, but this one doesn't include it.