Issue with 'after_menu' argument in 'addons'

The 'after_menu' argument is being outputted after the loop (In multiple
mode) while the 'before_menu' is being outputted in the loop. This means
if you have multiple addon options and these arguments set then you
will output more "befores" than "afters". Similar to #2335