Eliminate unnecessary "intermediate" properties