[ refactor ] Removed commented-out code.
[ refactor ] generalized isRecordType to tryRecordType.
[ refactor ] Made a line easier to read (pointfull).
Merge branch 'maint-2.4.0'