[query] Cleaning up nits from #2049 and #2055

[arnikola]

Cleans up nits from #2049 and #2055 which we didn't manage to address in those PRs

[codecov]

Codecov Report

Merging #2056 into master will increase coverage by 3%.
The diff coverage is 73.9%.

@@           Coverage Diff            @@
##           master   #2056     +/-   ##
========================================
+ Coverage    68.1%   71.2%     +3%     
========================================
  Files        1011     999     -12     
  Lines       87290   86544    -746     
========================================
+ Hits        59498   61654   +2156     
+ Misses      23368   20640   -2728     
+ Partials     4424    4250    -174

Flag	Coverage Δ
#aggregator	57.4% <ø> (-23%)	⬇️
#cluster	68.1% <ø> (+8.5%)	⬆️
#collector	65.4% <ø> (+45.5%)	⬆️
#dbnode	75.1% <ø> (+4%)	⬆️
#m3em	23.3% <ø> (-40.8%)	⬇️
#m3ninx	41.6% <ø> (-32.4%)	⬇️
#m3nsch	2.5% <ø> (-48.7%)	⬇️
#metrics	18.4% <ø> (-15.7%)	⬇️
#msg	20.1% <ø> (-54.7%)	⬇️
#query	64% <73.9%> (-1.4%)	⬇️
#x	60.6% <ø> (-16.2%)	⬇️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8cbe5a8...33bb32c. Read the comment docs.

[robskillington]

LGTM