Separate lines for the if's please.

Otherwise, please squash down to 2 commits (one for the replaygain reading for mp4, one for the change here) and we should be good to go.