Improve macro-based property mapping.