Added observer remove/add to property generation macros.