Replace instance methods with extension methods to reduce class complexity.
More awesome changes.
Remove replay expectations.