Try to fix return and block passing mixup after it has been parsed - fixes #305.