[PATCH 5/6] cleanup code duplication