Amend to allow preprocessor definitions (bundled with library functions). Allow public/private on procedures