Use list comprehensions for overriding settings

This (hopefully) fixes the issue of editing lists inplace as pointed out
by @szuliq (twice).

My apologies to all concerned for my sloppiness.