Attempt to improve clarity of debug log by unifying arg param order