Improvements from faux's changes.