Fixups: 5.6 compat, move "deps" comment.