Restructure defaults, document attiribs and call sig of repeat/retry