SI-9060

Accept fifth-edition names.

Fix infinite loopiness in attribute parsing.

Improve tests a bit.