Moving type specifiers into outer package to avoid cyclic package dependencies.