Replaced duplicate code in Data with macro calls. Added AUTOLAZY parameter (defaults to off for now.)