First-order-transform fixes.