Fix/default args coercion

[jlouis]

I managed to fix half of the code base with the previous default argument changes. I still needed a pass over the arguments to fill in the blanks where applicable. This patch should do it.