Need to escape some underscores (for compatibility with 0.13.1).