Makes it easier to update either way.
Once again, treating module as function calls, since that's basically what they are...