Make wmaker 0.11% smaller by avoiding code duplication