Minor fixes around annotations

[nvasilakis]

[github-actions[bot]]

OS:ubuntu-18.04 Thu Jul 29 16:33:48 UTC 2021 intro: 2/2 tests passed. interface: 6/6 tests passed. compiler: 48/54 tests passed. evaluation/tests/results/ann-agg_2_distr_.time evaluation/tests/results/ann-agg_8_distr_.time evaluation/tests/results/bigrams_2_distr_.time evaluation/tests/results/bigrams_8_distr_.time evaluation/tests/results/shortest_scripts_2_distr_.time evaluation/tests/results/shortest_scripts_8_distr_.time

[github-actions[bot]]

OS:ubuntu-20.04 Thu Jul 29 16:53:02 UTC 2021 intro: 2/2 tests passed. interface: 6/6 tests passed. compiler: 48/54 tests passed. evaluation/tests/results/ann-agg_2_distr_.time evaluation/tests/results/ann-agg_8_distr_.time evaluation/tests/results/bigrams_2_distr_.time evaluation/tests/results/bigrams_8_distr_.time evaluation/tests/results/shortest_scripts_2_distr_.time evaluation/tests/results/shortest_scripts_8_distr_.time

[angelhof]

I think that we should not merge this before we investigate what are the new failing test cases. I might have some time to take a look. If we want to merge these (and other changes) faster (without making sure that correctness tests pass) we can use the future branch.

[nvasilakis]

@angelhof Agreed! BTW we think we know why tests are failing, and we're working to fix them.