Mostly moved "self"-style reset functions

reset* functions shouldn't create lambdas; they should reference
prototype functions.