Add the fn being gated to the new writeable macros (#8353)