doco tweaks and tidy up for GROOVY-6889 and GROOVY-6887