Added function replacement, fixed keyword macro args, added keyword node construction.