SubStatement as 'object' in Statement handling

Adjusts work from @mnutz slightly and starts Statement testing.