Very small refactoring at withHeaders()