Fix #117, Improve the comment expander mechanism