Added macro param-push, simplifying a lot of code