Remove extraneous comments
Remove methods that are already enabled by number protocol
Add explicit tests for non-circularity and use standard number-protocol syntax