Internals: Renames for interfaces. No functional change.
Fix arrayed input compile error, bug645. Try 2.
Merge branch 'master' into stable-sort