Fix a bug with WITH_OFFSET and match().
Update documentation to add constant aliases.