make the short version short

by moving some of it to the long version so that the long version really is longer cf. #576