Use new inner attribute syntax everywhere

See #13478

This PR is based on #13477.