[PATCH] simplify recent API additions