Revert "Prefer a local to class metaprogramming; no explicit self."

This reverts commit 1ec7f49f54494e94172c5df66993d9939340008d.