Better FK regex in pwiz, fixes #300