A few more fixes for formatting

Firstly, this call should have been a 'logical' call instead of 'physical'. Also add a fix so that we can merge some lines together if they are short enough.