Simplifications & a bug fix.