Get rid of unnecessary calls to getProperty()