updates per @ahocevar's comments in https://github.com/opengeo/mapstory/issues/511#issuecomment-13426086