Minor Spring XML cleanup