Fixed misc_function syntax errors

The merge wasn't done correctly so I had to fix some minor syntax
errors.  Resolved conflicts and now everything is awesome.