REL-1501: Storing Scale Interpolation in TPE and code cleanup.