Fix layouts to operate as advertised

Resolves #42. Might want to add more types or just use the extension without checking.