The changes to Assertion in 31ec59d may afford some opportunity to clean up the JSTL here.