Finished tidying up our Spout checking.