Move more top-level declarations into standalone