AAC parser updates

We've been using this branch in production successfully for a few weeks now.