Methods no longer inherit generics
Add missing trailing char
Unescape should strip rd class
Revert #265