Reduce code size even further