#25: Retrieve the wrapper argument for the validation callbacks.
Merging all the work from master.
Woops. Remove sonmething we didn't need.