Fix issue with header keyword-to-literal reversions