Revert "Simplify"

This reverts commit f1290bb7008bac4ac0a2b005a00df0e3920d8247.

Conflicts:
	lib/client.js
	lib/parsers.js