JAL-4019 finalised a boolean option and tidied some comments