Tidy up static links and remove ChriDevisms