remaster: make some conditions cleaner