[PATCH 0/4] Use new infrastructure in more simple cases