- Remove some duplicated/useless code and use internal forward exports instead.