Addressing structural concerns from appsdir review.