Improve `--nointerpolate` handling