Slightly improved our settings code.