Hi Diego, Although I liked it this way, your change makes sense. If we decide to go back, that you be easy to resurrect the previous behavior. LGTM with maybe a test case with two options and we check that we only emit what is related to the last one. Thanks, -Quentin http://reviews.llvm.org/D3614