Fix trowel to not rely on outdated cl-6502.