Tidy up some of the RC code

Using a magic property assignment macro and a logging side effect