JSF -- Beginning of cleanup in markup.