Just a few tweaks

There's also room for mutualization, like System props handling, but I don't know if you want to go that far.

Very happy that you'll be talking about Gatling, guys!