Switch to using compound literals for smaller code.