Get rid of W->A calls.

2 files changed