Yats updated.
Macro pollution fixed with MORE_ prefix.