Refactored macro to use ComputedProperty meta instead of object's meta - for real this time

- Includes fix to problem caused by not saving meta