Move the knowledge about which flags require an extra value into a separate function...