Replace functions from the S library

Replace references to s-match and s-starts-with? with inbuilt alternatives. Hopefully fixes issue #83