Removing noweb and macros for amortize-js functions