Move expr_ related functions together at the top of the file