Changed preprocessing to post-processing, joined inner program statements as well as block statements.