Fixed "none.get" exception during replace.
Fixed bug of some function call expression not being replaced in a conditional statement by their corresponding inline compound statement expression