Move expansion symbols a bit to right
Merge branch 'refine-expansion-symbols'

Close gh-108.