std: Remove some @-boxes