Making argument index optional and heavy OCD