[PATCH 1/3] use non-vararg functions if possible