Consistent function calls in compiler
Got rid of metaprogramming