Cleanup the dump() and _dump() functions. Remove a bunch of
inline PHP and move everything towards print instead