s3: Make an if statement a bit easier to read