More cleanup of top level variables.