As it's on master, it seems OK to be consistent everywhere even if it means changing more things, and NoAnswer seems to better comply with the rest of the code