Cleaner (well, we do what we can) fix. Closes #639.