clean up syntax to match style guide; bug 976547