Improve definitions to better match Sinon 1.7