Better optional argument handling.