Improve expression safety