wip: apply Romain's hints.