Handle default arguments differently for 1.8.7