Normalize on gpg

Closes #684.