Style fix -- keep arguments on same line as much as possible