Is the issue that line 1081 should be split so that 'has-kw?' and 'has-opt?' are on different lines or is it something else?