Update s/// behavior to match spec as per eca5f2f2

As per the referenced spec commit, s/// is supposed
to always return a Match object or Nil if there was
no successful match.