Re-indent and quote versions in Makefile

No functional changes
Fix overly-enthusiastic parenthesis unroller (RT#99503)