This fixes linking hello world with -dynamic. I've also added some more
variables, so there is less duplication between the different ways of
linking.