Improved support for handling code that uses anonymous defines