When I consolidated code, I found two implementations of the "self" link. If you're happy with the implementation I picked, feel free to delete these two comment lines.