TYPOC-21: fix expression field association
TYPOC-21: fix docblock, CS