Do some Meson cleanups done elsewhere

6 months ago, Elliott Sales de Andrade