Some tidying up, make perl gurus sleep well at night.