Rewrite: Consistently handle Mask memory suffix like Images