Initial work on supporting M521 and w-521-mers.