Closes #12: Layout parsing is now done where context is available.