RainerServlet: Use storage.headsNonEmpty when appropriate.