Tidying up of code for @chebop/spy.