Uncombine layer and info. Fixes #190. Fixes #188.