Finish the elaborator, including modules