improve s:expand()