Actually by avoiding using $(P) we don't even have to worry about whitespace, so I'll be making your suggested changes now.