Remove redundant initializers and return statements, fix a suspicious lookup