Round 2 of overload support.