Fixed support for nested defines