After those fixes, it might still be okay for this to be on a single line, but it might be nicer to just break it out into separate lines anyway.