Consistently use $(...)

Change-Id: I68d3f99ca2a53988fb40ce0d5d364e19a8781cc0