Turn some macro functions into static functions