Whitespace cleanup

Signed-off-by: Stefan Marr <git@stefan-marr.de>
Remove elidable annotations which should not be necessary, and are not applied in primitive either

Signed-off-by: Stefan Marr <git@stefan-marr.de>