Handle space fallback

[behdad]

Now that compat decomposition is gone (#152), it's more important to handle different spaces better.