Fix key signature extras and incorporate review comments.