Convert helper functions into one-liners