Further improvements (feedback from cpage).