Revert "Merge methods and pass on resultClass to error methods."

This reverts commit 88b51cdd490199d477c85e5b9294e44777fdf157.
Separate parsing.