$subj, now with forward declaration also removed.