Fix infinite regress; better method names.