Some trivial arrangements.
Signed-off-by: MORITA Shintaro <shin@sysphonic.com>