WIP: address @ogrisel comments (2)