Fixed a one-liner and one long line that I missed
until reviewing on GitHub.