haltest/client: Remove duplicate code