ace: fix build on 10.9 and cleanup.

Closes #23469.