Added "yield" and "finally" support