Don't use bare variables any more!