Convert some OTS_WARNINGs to messages
Drop inter-dependency between layout tables

Fixes #14