Make more macro functions into static functions