const strings where necessary, `delete' is now `remove'.