Convert stuff to use declared safe macros