Add slightly drier version and helper functions.