Ensuring that ...s are surrounded by spaces

@shazron please merge