Refactor pitch from diatone, adding key definitions.