Improved non-macro usage.