Fix and simplify par params parsing in get_containing_layout.

The previous verion did not catch \align <alignment>.

Richard, this should go to branch as well.