JAL-2541 clearer comments (redo of lost commit f7967ad)