Revert "allow callable objects to be passed into before/after options"

This reverts commit 31650f31ed28d9f479f9188215744181b94beb4c.
allow callable objects to be passed into before/after options