Tidying left-over debugging.