Add flags2 to block lookups so they can be retrieved by tools with the power to do so.
Fix old typo in #defined name.