Revert work on removing {} and __unused