Updated for macro changes requiring semicolons.