Added support for expanding to a statement with and without semi colon