Made focus trapping re-definable (#389).
Misc.