Improve the building descriptors.

References #673.