After discussion on IRC this is ok.