Add supprt for on-arrival, on-departure and on-display code blocks.