move Deferred constructor out of m.deferred
simplify check as per suggestion in  #206
simplify null/undef checks
fix handling of `+` in parseQuerystring