Switch parameters to non-null by default