Optimize compile time

[Voultapher]

The first commit is just cosmetic as discussed, the second one has net positive effect on total compile work, as seen in the User time.

before:

Benchmark 1: cargo build
  Time (mean ± σ):      2.621 s ±  0.026 s    [User: 8.244 s, System: 0.544 s]
  Range (min … max):    2.596 s …  2.647 s    3 runs

after:

Benchmark 1: cargo build
  Time (mean ± σ):      2.610 s ±  0.009 s    [User: 7.986 s, System: 0.550 s]
  Range (min … max):    2.600 s …  2.615 s    3 runs