minor cleanup in pow_expand method

put the return self; statement immediately after the two if statements
at the beginning. Note that this commit doesn't change the logic of the
expand method.