Further updates to strong-arm.