Minor tweaks to better support unwrapped properties