Avoid some bloat