convert a few more functions to new syntax