replace missing dash and s functions

Hi. It turns out some function calls utilizing `dash` and `s` slipped into the code when I copied a missing function definition after I removed the dependencies on `s` and `dash`. This PR corrects that.