Use new inner attribute syntax everywhere

See #13478