add support for name=value@ attribute syntax; assertion fix