Cleaned up the some stuff for BZ#1080207.