Start integration of @lessbloat improvements.