Cleaning up a few spacing issues that developed during canonicalization