Reviewed-by: okutsu

Summary: rearranging code saves 5 bytes of bytecode
Reviewed-by: sherman

Reviewed-by: mr

Reviewed-by: okutsu, naoto