Get rid of W->A calls.

4 files changed