Moved not exported package variables to local context.