Revised argument handling to do so through central module, hopefully simplifying it. We will see.