RF: minor 2-to-3 work