APF-1358: Polishing related to Tapestry 5.4 upgrade.