Better @package/@subpackage assignment