Fixed chinooks not taking sub cells into account

Fixes #6068 & #4605
Style nit: newline between `}` and the next method definition for non-single-line definitions.