Even if it looks nicer, I guess this breaks current coding styles. Same for the change below.