Cleaned up lingering warning about <anonymous>:... caused by not
feeding optional args ... all the way through the codebase