More #29 cleanup