more minor tweaks

including:
tweaked behavior of setAutoRetryMax(); inserted some return values; removed a few single-use private methods
merged more single-use methods
rearranged some methods into alphabetical order