Cleaned up and documented cluster support, so that we use a consistent
mechanism across batch types.