layout_builders: added static bounds to generic types to allow compatibility with...