#349 Fixed some more bugs relating to use of 'this'. Removed map files because debugging was disrupted. I'll just have to get approximate line numbers from js for ts files.