Code cleanup.
Quick and dirty test for multiple spaces and aliases.
Less dirty test for multiple spaces and aliases.