Revert to optional question mark; code style++
Move branch guard where it's more natural.