Amend previous changes introducing delegate over class_eval

See e91ddd9, b905573, and 017f6a6.