Minor pitch handling cleanups.
3 files changed