Simplified some macro signatures.
Be more explicit and precise when materializing Cases.