Instead of renaming all the calls to resolveProperties to ctfeResolveProperties, wouldn't it be less intrusive to add the extra logic to resolveProperties?